From: Rui Matos <tiagomatos@gmail.com>
Date: Thu, 21 Jan 2016 15:44:18 +0000 (+0100)
Subject: st-widget: Avoid passing NULL to atk_object_get_role()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1016
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c25c143b245a5ee63656bec75e04a7829b3dd54c;p=gnome-shell.git

st-widget: Avoid passing NULL to atk_object_get_role()

This never worked since the code landed but apparently no-one noticed
until now.

The intent here is to return the accessible's default role if none has
been explicitly set on the StWidget instance.

https://bugzilla.gnome.org/show_bug.cgi?id=760945
---

diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index 0f1a34e7b..e20c845a0 100644
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -2420,7 +2420,6 @@ AtkRole
 st_widget_get_accessible_role (StWidget *widget)
 {
   StWidgetPrivate *priv;
-  AtkObject *accessible = NULL;
   AtkRole role = ATK_ROLE_INVALID;
 
   g_return_val_if_fail (ST_IS_WIDGET (widget), ATK_ROLE_INVALID);
@@ -2430,7 +2429,7 @@ st_widget_get_accessible_role (StWidget *widget)
   if (priv->accessible_role != ATK_ROLE_INVALID)
     role = priv->accessible_role;
   else if (priv->accessible != NULL)
-    role = atk_object_get_role (accessible);
+    role = atk_object_get_role (priv->accessible);
 
   return role;
 }